From: Christian Kellner <christian@kellner.me>
Date: Thu, 19 Apr 2018 12:22:04 +0000 (+0200)
Subject: thunderbolt: sync D-Bus API with bolt changes
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~929^2~5^2~86
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fb509dfc25e6012f3c3748b3e0045fa8cf6fff38;p=gnome-shell.git

thunderbolt: sync D-Bus API with bolt changes

bolt 0.3 deprecated all AUTHORIZED_XXX status flags, but added
a CONNECTING one. Also AuthFlags got renamed to AuthCtrl.
---

diff --git a/js/ui/status/thunderbolt.js b/js/ui/status/thunderbolt.js
index f3236f21c..98e81dbf3 100644
--- a/js/ui/status/thunderbolt.js
+++ b/js/ui/status/thunderbolt.js
@@ -56,12 +56,11 @@ const BoltDeviceProxy = Gio.DBusProxy.makeProxyWrapper(BoltDeviceInterface);
 
 var Status = {
     DISCONNECTED: 'disconnected',
+    CONNECTING: 'connecting',
     CONNECTED: 'connected',
     AUTHORIZING: 'authorizing',
     AUTH_ERROR: 'auth-error',
-    AUTHORIZED: 'authorized',
-    AUTHORIZED_SECURE: 'authorized-secure',
-    AUTHORIZED_NEWKEY: 'authorized-newkey'
+    AUTHORIZED: 'authorized'
 };
 
 var Policy = {
@@ -70,7 +69,7 @@ var Policy = {
     AUTO: 'auto'
 };
 
-var AuthFlags = {
+var AuthCtrl = {
     NONE: 'none',
 };
 
@@ -141,7 +140,7 @@ var Client = new Lang.Class({
     },
 
     enrollDevice(id, policy, callback) {
-	this._proxy.EnrollDeviceRemote(id, policy, AuthFlags.NONE,
+	this._proxy.EnrollDeviceRemote(id, policy, AuthCtrl.NONE,
                                        (res, error) => {
 	    if (error) {
 		Gio.DBusError.strip_remote_error(error);